Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Wed, 24 Aug 2005 20:29:21 +0000 (13:29 -0700)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Wed, 24 Aug 2005 20:29:21 +0000 (13:29 -0700)

Trivial merge